account/models.py

@@ -384,10 +384,9 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             }
              

                         ]
              

                 
              

                -    @property
              

                -    def srinfo(self):
              

                +    def srinfo(self, brand_id=None):
              

                         try:
              

                -            sr = SalesResponsibilityInfo.objects.get(user_id=self.user_id, user_status=SalesResponsibilityInfo.ACTIVATED)
              

                +            sr = SalesResponsibilityInfo.objects.get(brand_id=brand_id, unionid=self.unionid, user_status=SalesResponsibilityInfo.ACTIVATED)
              

                         except SalesResponsibilityInfo.DoesNotExist:
              

                             sr = None
              

                         return sr.base_data if sr else {
              
@@ -419,7 +418,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                             'cardList': self.cardList,
              

                             'saleclerk': bool(saleclerk_info),
              

                             'saleclerk_info': saleclerk_info,
              

                -            'sr_info': self.srinfo,
              

                +            'sr_info': self.srinfo(brand_id),
              

                         }